Use better icons for home and desktop.

2004-03-08  Anders Carlsson  <andersca@gnome.org>

	* gtk/gtkfilesystemunix.c: (get_icon_for_directory),
	(gtk_file_system_unix_render_icon):
	Use better icons for home and desktop.

diff --git a/ChangeLog b/ChangeLog
index 03b8fe17cf80d11ca8c3f9570baa3c7a7a7af0c0..58e09fd6b087662cccbde48b11b2dd0c5449d8a4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-03-08  Anders Carlsson  <andersca@gnome.org>
+
+       * gtk/gtkfilesystemunix.c: (get_icon_for_directory),
+       (gtk_file_system_unix_render_icon):
+       Use better icons for home and desktop.
+
 2004-03-08  Anders Carlsson  <andersca@gnome.org>
 
        * gtk/gtkfilechooserentry.c:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 03b8fe17cf80d11ca8c3f9570baa3c7a7a7af0c0..58e09fd6b087662cccbde48b11b2dd0c5449d8a4 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2004-03-08  Anders Carlsson  <andersca@gnome.org>
+
+       * gtk/gtkfilesystemunix.c: (get_icon_for_directory),
+       (gtk_file_system_unix_render_icon):
+       Use better icons for home and desktop.
+
 2004-03-08  Anders Carlsson  <andersca@gnome.org>
 
        * gtk/gtkfilechooserentry.c:

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 03b8fe17cf80d11ca8c3f9570baa3c7a7a7af0c0..58e09fd6b087662cccbde48b11b2dd0c5449d8a4 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+2004-03-08  Anders Carlsson  <andersca@gnome.org>
+
+       * gtk/gtkfilesystemunix.c: (get_icon_for_directory),
+       (gtk_file_system_unix_render_icon):
+       Use better icons for home and desktop.
+
 2004-03-08  Anders Carlsson  <andersca@gnome.org>
 
        * gtk/gtkfilechooserentry.c:

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 03b8fe17cf80d11ca8c3f9570baa3c7a7a7af0c0..58e09fd6b087662cccbde48b11b2dd0c5449d8a4 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2004-03-08  Anders Carlsson  <andersca@gnome.org>
+
+       * gtk/gtkfilesystemunix.c: (get_icon_for_directory),
+       (gtk_file_system_unix_render_icon):
+       Use better icons for home and desktop.
+
 2004-03-08  Anders Carlsson  <andersca@gnome.org>
 
        * gtk/gtkfilechooserentry.c:

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 03b8fe17cf80d11ca8c3f9570baa3c7a7a7af0c0..58e09fd6b087662cccbde48b11b2dd0c5449d8a4 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2004-03-08  Anders Carlsson  <andersca@gnome.org>
+
+       * gtk/gtkfilesystemunix.c: (get_icon_for_directory),
+       (gtk_file_system_unix_render_icon):
+       Use better icons for home and desktop.
+
 2004-03-08  Anders Carlsson  <andersca@gnome.org>
 
        * gtk/gtkfilechooserentry.c:

diff --git a/gtk/gtkfilesystemunix.c b/gtk/gtkfilesystemunix.c
index 88383c4d8c9d55a8352b90ff4530a37ab572e9a8..9f9c9ebb16e929a2440e4dfc5f4f5cf2ece7dc37 100644 (file)
--- a/gtk/gtkfilesystemunix.c
+++ b/gtk/gtkfilesystemunix.c
@@ -824,6 +824,25 @@ gtk_file_system_unix_filename_to_path (GtkFileSystem *file_system,
   return gtk_file_path_new_dup (filename);
 }
 
+static const char *
+get_icon_for_directory (const char *path)
+{
+  static char *desktop_path = NULL;
+
+  if (!g_get_home_dir ())
+    return "gnome-fs-directory";
+
+  if (!desktop_path)
+      desktop_path = g_build_filename (g_get_home_dir (), "Desktop", NULL);
+
+  if (strcmp (g_get_home_dir (), path) == 0)
+    return "gnome-fs-home";
+  else if (strcmp (desktop_path, path) == 0)
+    return "gnome-fs-desktop";
+  else
+    return "gnome-fs-directory";
+}
+
 static GdkPixbuf *
 gtk_file_system_unix_render_icon (GtkFileSystem     *file_system,
                                  const GtkFilePath *path,
@@ -862,7 +881,7 @@ gtk_file_system_unix_render_icon (GtkFileSystem     *file_system,
          name = "gnome-fs-chardev";
          break;
        case ICON_DIRECTORY:
-         name = "gnome-fs-directory";
+         name = get_icon_for_directory (filename);
          break;
        case ICON_EXECUTABLE:
          name ="gnome-fs-executable";